Revision: bazaar--devel--1.1--patch-37
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Thu Dec  9 21:35:32 EST 2004
Standard-date: 2004-12-09 10:35:32 GMT
Modified-files: commands/star-merge.c
    libarch/build-revision.c libarch/merge-three-way.c
    libarch/merge-three-way.h libarch/pristines.c
    libarch/proj-tree-lint.c libarch/star-merge.c
New-patches: robert.collins@canonical.com--general/bazaar--devel--1.1--patch-37
Summary: make --three-way the default for star merge, and fix thus uncovered bugs.
Keywords: 

